Skip to content

Conversation

lolbinarycat
Copy link
Contributor

instead of calling into git or checking the modification time of files, simply print the warning if there is a very large number of "modified" files.

also make the wording much softer, so false positives are less alarming.

(warning was removed in #134935)

@rustbot
Copy link
Collaborator

rustbot commented Jan 9, 2025

r? @onur-ozkan

rustbot has assigned @onur-ozkan.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jan 9, 2025
@rust-log-analyzer

This comment has been minimized.

instead of calling into git or checking the modification time of files,
simply print the warning if there is a very large number of
"modified" files.

also make the wording much softer, so false positives are less alarming.
@lolbinarycat lolbinarycat force-pushed the bootstrap-old-master-resurected branch from 4288919 to e1772e7 Compare January 9, 2025 20:36
@rust-log-analyzer

This comment has been minimized.

Comment on lines 117 to 119
if len > 1000 {
println!("hint: if this number seems too high, try running `git fetch origin master");
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the if here should include "not a CI" check as we are not interested on this for CI environments.

@onur-ozkan
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 11, 2025

📌 Commit 60cbd74 has been approved by onur-ozkan

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 11, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 11, 2025
Rollup of 6 pull requests

Successful merges:

 - rust-lang#134074 (bootstrap: `std::io::ErrorKind::CrossesDevices` is finally stable)
 - rust-lang#135236 (Update a bunch of library types for MCP807)
 - rust-lang#135301 (re-add a warning for old master branch, but with much simpler logic)
 - rust-lang#135324 (Initial fs module for uefi)
 - rust-lang#135326 (support target specific `optimized-compiler-builtins`)
 - rust-lang#135347 (Use `NonNull::without_provenance` within the standard library)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8c3e9d7 into rust-lang:master Jan 11, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 11, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 11, 2025
Rollup merge of rust-lang#135301 - lolbinarycat:bootstrap-old-master-resurected, r=onur-ozkan

re-add a warning for old master branch, but with much simpler logic

instead of calling into git or checking the modification time of files, simply print the warning if there is a very large number of "modified" files.

also make the wording much softer, so false positives are less alarming.

(warning was removed in rust-lang#134935)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants